Fixes for #14