we must stay at 4.2.1, fix remaining things