Minor improvements on the params handling