Groups and contacts - fixes