Jim Abblett's changes for gcc compile