Fix some quirkyness.