Minor fixes to Inverted mode