More work on fixing performance issues