A couple of hotfixes and updates