Small fixes in 2.1 and 3.1