Fixed more deprecation errors and warnings