Fixes for validation errors in models