Few updates from 4.1.0