Zap TK 2.2.0

Minor bug fixes