Minor fixes when i cherry pick major commits ;)