validator fixes and model adoptions