Tighten up some glitches on the new Apache glue