fixes

fixes from jekov