fixed last remaining issues before v2.1.0