Minor patch to address Day 1 issues