Merge Tk build fix.