Fixed deprecation warnings ^_^