Changes to accomodate g++ as a compiler