Backport pbi mount fixes