Various updates & security fixes