Performance tweaks

Performance tweaks