Fixes to meet guidelines for approved extensions