- Performance tweaks