Fixed weird mess-ups.