VE-1280: Fix lint/hint related issues