Fix circular dependancy on building