Round of fixes for #105
Reverting part of #94