More tweaks from profiling