Fix sill bugs.  Only 7 failures in compiler now.