Fixed two TODOs