Bug Fixes for INT mode