Some map spawn changes to make it more seamless