Merge "Fix error prone warnings"