Some minor changes that might help with the bugs seen yesterday.