Changes to get it to compile with g++ on COE computers