Updated patches and cleaned up files