Bug fixes and content-assist enhancements