Fixes after reprocessing #689 #690

Alvin Noe Ladinesrequested to merge
parser-fixes into v1-process

Provided fixes for the list indicated in issues #689 (closed) #690 (closed)

Merge request reports