Fix static imports