Minor changes to improve argument validations