actually does compile now after the previous minor fixes