Contact system fixes, random standardization