Initial fix for optional named params