Merge "Fix two issues"