More fixes for 10-current patches