Fixed map insertion and some other things