A few updates to get it to work on mission control