Fixed some startup errors