Fixed compatibility; remove deprecated calls
Fixing compatibility with Clipper