Fixed more problems with compilation
Compiling but shapeless doesn't like it