Fixed some issues with mako template