Added some ubuntu fixes.