Merge "Add casts to avoid errors due to narrowing"