Ubuntu fixes and adaptations