Fix compilation errors, Closes #63