Fixes for #1