Build issues sorted