Fixed weird things