add a few fixes for paths and links