Address more Bitmap comments