Fixing build errors after code cleanup.