Fixes for mion g++