Fixes for #38