Fix annotation
First pass though vMR templates.