lint and deprecation fix