Cleanups to get it to at least build on BGQ