Some minor refinements on Bitmap loading