Include some missing changes from master