Few little improvements