fixes after repo merges into one.