Fix port auto-boxing to force to integer
Fix inconsistent naming
Cleanup disable options

As suggested by @portertech