fixed beaver/fabric bugs