Fix import and missing files