Fix some TODO stuff