Fixes before asking Tejaswi to try it out