Small fixes 2.0.1