Fixes

Please check these fixes