Minor specs2 fixes.