Bugfix/failing ci

More fixes to the CI.

This addresses 'stacks'.

![](http://media.giphy.com/media/H6JVtGoSouOCQ/giphy.gif)