Some fixes for the patch.