More pathbar fixes