Some nits fixing