Correcting the defects that came up during the presentation to Fernando.  These two bugs are intermittent and are hard to reproduce.