Project Starship X: Quick fix

Fixed a few soft-lock situations. Hopefully all of them!