Fix to type references and got it recompiling