Fixes to outline as requested by Tom