Additional strategies-related changes and improvements