Some mission fixes