Fixes build errors

Closes #7