Fixed some quirks.