Minor Performance tweaks