fixes for spawn system