Fixed regressions in bitmap modules