Add  to several s in . Closes #289