Even more compile error fixing