More temp fixes for 422s