fix startup issues

fix startup issues