Fixed static imports