Updates to work with latest 4.0.8