CHANGES fixes