COMP: More faffing about getting stuff to compile