Fixed non-linker compile errors