Whoops, forgot to remove debug code.
Fixes for build errors, but still doesn't build.