Consume Mike's tweaks from 7561d8190e8f650b812f6b32aab59f14669cc019