Fix missing/broken imports