Merge "Fix misc minor issues"