Some performance issues solved