Compile issues fixed