Fix links helpers