Fixes for spawning and level events