Updated input checks