More fixes for new argument ordering