Multiple fixes to infos/deps/names etc.