Zap TK 2.2.7

Minor bug fixes