Fixes

some fixings