Minor fixes. Closes #8