Tweaking some things