Bug fixes for validations and other