Even more scary poc7 changes