Fixing old mistakes