Pre-release code optimizations