Bug 1095813 - Fixup use int instead of strings