GrayFabric fixes