Intmaps fixes before release