Merge "Fix some errorprone warnings"