Fixing tweaks