fixes for previous commit