Tweaking and fixes