SOCIAL: Many small fixes