Fixes from issues with updated base Ubuntu image