Even more performance hacks