Fixes

Tested with 9.2 and 10.0.