Fixes for validation, format