Tweaks, final checks