Fix compile errors
bitmap tweaks