Fixes for f34964fdb0