Fixed enums to contain base type and use int as default one.