Ubuntu fixes

A couple of Ubuntu fixes for issues discovered when testing #240.