Fixes and 10.21