Latest fixes to support Basepath