Updating stuff from 4.6.