Minor change of default parameters