Fixed 4 validation errors