More fixes.  Also updated ClearKey