Fix remaining reverse calls