Fix issues with 6a80b5f, compiles correctly now