Fixing use statements