Make little improvements