 - Fixes to first-start case
 - Fixes to first-start case

hbirchtree/coffeecutie-build-daemon,hbirchtree/coffeecutie-build-daemon,hbirchtree/coffeecutie-build-daemon,hbirchtree/coffeecutie-build-daemon,hbirchtree/coffeecutie-build-daemon,hbirchtree/coffeecutie-build-daemon