[#79] additional path fixes