Fixes for #5 and #6.