staging/parser minor fixes / changes