Tweaked a couple of values