More changes to the Bitmap loading.