Fixing some typos and unused vars