Lot of fixes to get extensions working better