Closes #752, closes #751