More fixes for the patch