Some more fixes to references