A couple of shell improvements