some fixes to the extensions