Performance tweaks part 2