Fix nullable params and default policy