Additions meant to be part of #398