Fixing bugs related to changing parameter orders