Fixed more input validations