Fix broken build and Issue #93