Fix startup error
Fix crash issues