Fixing last details