#282 security fixes