A few bug fixes following dev testing on a test Ubuntu Server.