More bitfive conditional fixes