Optimized imports (fixes some minor compilation errors).