Added some deprecation warnings workarounds (see #89).