spot fixes