Removing some deprecation warnings, still not compiling - #616