Address numerous issues with loading.