Fixes for #151