Few tweaks and fixes for Input/Validation/INI