Tweaking a few things