Merge "Small clean ups"