more fixes for previous commit