CMap fixes and speed improvements