Fixes & links