fixes for parser