Few changes after we make repo public.