Last fixes
Done