Some small performance fixes with chat controllers