Fix some startup glitches