Better handling of events in Space Port