Closes #218
Minor fixes