Final fixes from basis merge