fixes

few fixes