Performance tweaks #2