Spot fixes