more fixes

fixes