Compile fixes?