Minor fixes.  Haven't fixed much