fixes

fixes for previous commit