Compatibility fixes with OODT-0.8