minor fixes map