Fixes for Issues #34 and #35