Took care of more deprecation warnings