Minor fixes 2.0