Fix snomask deletion
More aggressively lock timer operations