Closes #759 Closes #758