Fix the build + 2 minor fixes

Why'd you comment out all this code?