Fix build

This branch fixes the build.

The only change I think needs to be fixed is: https://github.com/mbj/mutant/commit/428cf45fa62b9f150a8a94d7810ba231425427e1