ahem, security fixes