Mostly path fixing after new modules layout is in effect.