Fix strange stuff