stabilization fixes for mobile to mave v0.3.1