tested on 2.0.21 and 2.0.23, small fixes