fixes on insecure branch