roll up of fixes