More Ubuntu fixes