fix more explicity validation errors + fix keys generation