Vishal, Abhi #647 Fixing build