minor fixes (GHC's kind checking improved)