Closes #657; closes #658