Fixed inconsistencies with order of parameters