Compatibility fixes for IntelliJ 14, fixes #19