Fixing some tklpatch problems.