Different fixes after performance update.