0.20 Compatibility Fixes