Fixes/small fixes

some small fixes