Compile fixes, blah.