Fixing some bitmap => set missing changes