Few updates from 4.0.6