Merge pull request #1067 from cake-tech/generic_fixes

Generic fixes

Matthew Fosse committed Aug 30, 2023 at 12:30 UTC feca2410b803b934ab18dbf3299c7482227f0b80

No changes.