Fix stuff that codenvy broke