Start game fixes
Merge mark into develop