A couple of hotfixes.