Deprecated things fixed.