Final (?) fixes to Ghost Ahoy