Compile Error Fixes