Minor improvements
Last improvements