diff --git a/bin/nix/idea.sh b/bin/nix/idea.sh
index 18d98a1f40ba..3a16ccb56aa0 100755
--- a/bin/nix/idea.sh
+++ b/bin/nix/idea.sh
@@ -23,9 +23,16 @@ if [ -z "$JDK" ]; then
     JAVA_BIN_PATH=`which java`
     if [ -n "$JAVA_BIN_PATH" ]; then
       if [ "$OS_TYPE" = "MAC" ]; then
-        JAVA_LOCATION=`readlink "$JAVA_BIN_PATH" | xargs dirname | xargs dirname | xargs dirname`
-        if [ -x "$JAVA_LOCATION/CurrentJDK/Home/bin/java" ]; then
-          JDK="$JAVA_LOCATION/CurrentJDK/Home"
+        if [ -h "$JAVA_BIN_PATH" ] ; then
+          JAVA_LOCATION=`readlink "$JAVA_BIN_PATH" | xargs dirname | xargs dirname | xargs dirname`
+          if [ -x "$JAVA_LOCATION/CurrentJDK/Home/bin/java" ]; then
+            JDK="$JAVA_LOCATION/CurrentJDK/Home"
+          fi
+        else
+          JAVA_LOCATION=`echo "$JAVA_BIN_PATH" | xargs dirname | xargs dirname`
+          if [ -f "$JAVA_LOCATION/lib/tools.jar" ]; then
+            JDK="$JAVA_LOCATION"
+          fi
         fi
       else
         JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"`
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index 2e566f311c0c..cd35ff8e93b8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -1086,13 +1086,13 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
     final PrefixMatcher firstItemMatcher = itemMatcher(firstItem);
     final String oldPrefix = firstItemMatcher.getPrefix();
     final String presentPrefix = oldPrefix + myAdditionalPrefix;
-    String commonPrefix = firstItem.getLookupString();
+    String commonPrefix = handleCaseInsensitiveVariant(itemMatcher(firstItem).getPrefix(), firstItem.getLookupString());
 
     for (int i = 1; i < listModel.getSize(); i++) {
       LookupElement item = (LookupElement)listModel.getElementAt(i);
       if (!oldPrefix.equals(itemMatcher(item).getPrefix())) return false;
 
-      final String lookupString = item.getLookupString();
+      final String lookupString = handleCaseInsensitiveVariant(itemMatcher(item).getPrefix(), item.getLookupString());
       final int length = Math.min(commonPrefix.length(), lookupString.length());
       if (length < commonPrefix.length()) {
         commonPrefix = commonPrefix.substring(0, length);