Small improvements in passing parameters!