Sprint7 edits

@hippee-lee 

Fixes after adding new vn directives