Fix some deprecations warnings and tag options