Some changes for 3.1