some fixes in 3.1 and 3.2