Fabric partition fixes