Resolves more Ubuntu 12.04 issues.