Updates to configuration so builds work