Fixed parameter passing inconsistencies.