All the fixes for 0.2.0