Fixes for link