some fixes for #11