some fixes to optional args