smaller fixes for previous commit