Fix some other todos