fixes on manmap, towards RC24
state bug