Fixing and tweaking