More fixes! Faster loading.