Tweaks to decade fix