Fix: removed deprecated warnings