Fixes and making Envoy stuff work...