Small tweaks to fix Integer-defaulting warnings.