Deal with some installation and build issues

Related issues in the commits.