Fixed some issues with language parsing