Merge "Fix some interger overflow errors"