Further InverOver bug fixes