Minor fixes/improvements

Just a few things I've come across while switching our apps over to this SDK. ce99719 is a bugfix; the other two are performance/extensibility improvements