Small changes to make the automated deployment happier