moore fixes