Fix build error due to wrong import
Fix error due to static import definition