Fixed small compile errors after moving files from dup repo.