Ubuntu compatibility changes