Minor modal behaviour fixes