Some First Validation fixes