And a fix of stuff