1. Minor performance tweaks