fix building (#6 and #7)