Fixed this and the typo later and rebased on master.