Ubuntu

Minor modifications to support Ubuntu.