Tiny compilation error fixes

Had to rearrange a few definitions to make clang happy.