compile / test fixes