More disable fixes.