Fixes build errors

Completely solves #77