fixed more deprecation warning issues