Fixed all the contacts and references