Fixing some minor bugs/typos