Some Tk build fixes