Minor fixes, resolves #1