Last improvements for the patch