1.6.1 release optimizations