Fixed some strange bugs...