Closes #772, Closes #773.