Quick tweaks for optimization