Mergin a couple of hotfixes back into master