Fix more TARDIS Info System bugs