Closes #767 Closes #766