Fixes to parser based on parsing of scala/scala src files