Merge "Additional fixes for Ubuntu baseline"