Fix map and menu directives