Fixes for links