some fixes to imports for using in Framework