deprecation warning
small fixes