Pre-Ajax stability improvements