more idmap fixes