Some fixes to the extensions