Fixes startup errors