More Zen base fixes