Fixed caveats