Couple of hotfixes