Figure out some issues with flexible contexts which were breaking - extensions