A few minor fixes based on Ubuntu testing