Quick fix on deprecated features