Further dependancy fixes