fixes for issues identified in #34