Fix build issues

see #46