Fixes for #69