Minor layout optimizations