Resolved some todos