Fixed some more paths and listing of clocks