Fix some build process issues described in #61