more fixups on the move to Orion 7