Resolved some TODOs