Update to latest bitmap code
3 files changed