Small fixes
Working on dynamic links