andr-ew make_param fixes