Few 3.1 to 3.0 changes