more bug fixes for intellij 13.1.1