Fixes for dodgy links