Tweaks to see if this fixes problems.