Fixes in #924 for 2.99