Fix issues in startup