diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
index 95de29eec8d4..3198e149e621 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
@@ -301,7 +301,6 @@ public class GrCodeReferenceElementImpl extends GrReferenceElementImpl<GrCodeRef
         final String refText = PsiUtil.getQualifiedReferenceText(this);
         LOG.assertTrue(refText != null, this.getText());
 
-        final int lastDot = refText.lastIndexOf(".");
         String parentPackageFQName = StringUtil.getPackageName(refText);
         final PsiPackage parentPackage = JavaPsiFacade.getInstance(getProject()).findPackage(parentPackageFQName);
         if (parentPackage != null) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterImpl.java
index 335fb105433d..a40f8e75c75a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterImpl.java
@@ -289,6 +289,7 @@ public class GrTypeParameterImpl extends GrStubElementBase<GrTypeParameterStub>
     return PsiUtil.getJavaNameIdentifier(this);
   }
 
+  @Nullable
   public PsiElement getScope() {
     return null;
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrMethodStub.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrMethodStub.java
index 4e5454cebc79..c05cda2505fb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrMethodStub.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrMethodStub.java
@@ -37,7 +37,8 @@ public class GrMethodStub extends StubBase<GrMethod> implements NamedStub<GrMeth
                       StringRef name,
                       final String[] annotations,
                       final @NotNull String[] namedParameters,
-                      final GrMethodElementType elementType, @Nullable String typeText) {
+                      final GrMethodElementType elementType,
+                      @Nullable String typeText) {
     super(parent, elementType);
     myName = name;
     myAnnotations = annotations;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
index ef5a268f6081..639de5eff1ea 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
@@ -74,7 +74,7 @@ public class GrStubUtils {
   }
 
   @Nullable
-  public static String getTypeText(GrTypeElement typeElement) {
+  public static String getTypeText(@Nullable GrTypeElement typeElement) {
     return typeElement == null ? null : typeElement.getText();
   }