More bitmap fixes.

5 files changed