Merge "Fix minor issues"