Hotfixing cor-wip and to make travis-ci compile.