Some minor additions to support previous commit