few fixes

fixes