Switch types back, fix typo