Tweaking and fixing a few findings