More minor tweaking to allow for better stats