Small optimizations to new layout