Bug fixes from the future.