Fix more loading bugs.