Some refinements to Zinc

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>