fixes for @ecto's comments