Final tweaks of nab-fix