MOB-149

Various performance improvements.