Fix some more issues

That's fine, it's a compile time error. You can remove the TODO