Fixes

Latest changes