ubuntu-related fixes