Fixing problems with contacts not being valid...