Fix contextual links and stuff