More fixing after merge