Removed some TODOs & fixing build.