Update for changes to bitmap library