More reducer improvements