3.0 changes / fixes