Updates to get things to build on ubuntu 16 which is a bit stricter about a...

Updates to get things to build on ubuntu 16 which is a bit stricter about a few source language restrictions.  should affect anyone else

Former-commit-id: a9d56d76