more Emperor backports