Fix some TODO