Fix building of mas, and add support for labels in long directives