Fixes
Last changes