Correct some outstanding compiler errors