Fix for a couple startup errors