fix some quirks