Fixed a few compilation issues on bactra.