Solving some weird diff issues