Fixed last deprecation warnings (#71)