Fixed vmap extractor and assembler issues.