Minor changes to input check - 1.8