CXX-276 fixup default params