Tweaking some minor stuff