More machinery and type path fixes

Not parts are in null and not in machinery