Fixed some errors identified in validation