couple of fixes, closes #110