Fixed up the codebase to compile again.