TODO: Mark issues as resolved