Fix few regression that I have introduced in my previous commits