Small updates

I made these updates to fix issues I had with the latest Intellij Ultimate & Ubuntu 12.04 amd64