Just some spawn tweaks