security fixes from semarie