Version 4.1 minor improvements