A few min/max cleanups