Several Ubuntu Related Fixes