fixes in hope to get zuul working properly