more updates from mako 4.4.1