more bb10 optimizations on build #888