More low-level performance tweaks.
Fix build