Fixes for #17.