Further fixes with path bug in Offline