Miscellaneous fixes and enhancements

"Fixed"? "Singleton"?