Fixed paths as per Jamie's suggestions