Minor fixes - input filter