Merge pull request #321 from 7sharp9/base

Minor improvements to Language service
Fix for #280
Merge pull request #322 from 7sharp9/280

Fix for #280