Refs #0001   A couple fixes to improve support for different platforms