Minor improvements
3.3.0-rc1