Changes to compile on ubuntu

Small changes I had to do to compile on my desktop which is running Ubuntu 12.04.2 LTS