Fixed deprecation and feature warnings