Warning fixes after recent merges