Tower spawn changes, merged