Fixing some minor issues with the patch