Fixes

Check commits