Added volatile fixes.