Various fixes to paths to enable deployment with revised layout under
ubuntu