Fixing some more escapment bits.