Fixes to Planet