Fix issues with bitmaps.