Code review fixes for previous 'Add Modulo' push