Add fixes for grass_main_0.7 (by Saavik) and automapper rules (by hi_leute_gll)