Fixed weird consistancy bugs