two fixes for #6