import$ fixes and simplifications