Resolve include issue + argument mismatch