Updates and refactorings for Ubuntu.