Various fixes for correct parameter support